Switch to patched ostree gir

diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index 324c0a11daa57e0997a7adce4bab3463497aa1e4..8c902fd92dd75443baa7688416a9f997e76d134e 100644 (file)
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -1,7 +1,7 @@
 GIR_REPO := https://github.com/gtk-rs/gir.git
 GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989
-OSTREE_REPO := https://github.com/ostreedev/ostree.git
-OSTREE_VERSION := v2020.7
+OSTREE_REPO := https://github.com/fkrull/ostree.git
+OSTREE_VERSION := patch-v2020.7
 RUSTDOC_STRIPPER_VERSION := 0.1.13
 
 all: gir

diff --git a/rust-bindings/rust/gir-files/OSTree-1.0.gir b/rust-bindings/rust/gir-files/OSTree-1.0.gir
index f90fe38cb97b844ce217a3e1ca95c34d1e83bc32..4dd5387cc7321a7a1579ca48a73a21219759af3c 100644 (file)
--- a/rust-bindings/rust/gir-files/OSTree-1.0.gir
+++ b/rust-bindings/rust/gir-files/OSTree-1.0.gir
@@ -9263,7 +9263,13 @@ signature engine provided, FALSE otherwise.</doc>
                  line="1078">Signature engine used to check superblock</doc>
             <type name="Sign" c:type="OstreeSign*"/>
           </parameter>
-          <parameter name="out_success_message" transfer-ownership="none">
+          <parameter name="out_success_message"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full"
+                     nullable="1"
+                     optional="1"
+                     allow-none="1">
             <doc xml:space="preserve"
                  filename="ostree-repo-static-delta-core.c"
                  line="1079">success message</doc>

diff --git a/rust-bindings/rust/src/auto/repo.rs b/rust-bindings/rust/src/auto/repo.rs
index 3e62b8bcb85bcd4c4523957f365f12bf5ce8931f..5fff6359a616be6382f50d9bc0bba26ce0ff57f2 100644 (file)
--- a/rust-bindings/rust/src/auto/repo.rs
+++ b/rust-bindings/rust/src/auto/repo.rs
@@ -795,11 +795,12 @@ impl Repo {
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn static_delta_verify_signature<P: IsA<Sign>>(&self, delta_id: &str, sign: &P, out_success_message: &str) -> Result<(), glib::Error> {
+    pub fn static_delta_verify_signature<P: IsA<Sign>>(&self, delta_id: &str, sign: &P) -> Result<Option<GString>, glib::Error> {
         unsafe {
+            let mut out_success_message = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_static_delta_verify_signature(self.to_glib_none().0, delta_id.to_glib_none().0, sign.as_ref().to_glib_none().0, out_success_message.to_glib_none().0, &mut error);
-            if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
+            let _ = ostree_sys::ostree_repo_static_delta_verify_signature(self.to_glib_none().0, delta_id.to_glib_none().0, sign.as_ref().to_glib_none().0, &mut out_success_message, &mut error);
+            if error.is_null() { Ok(from_glib_full(out_success_message)) } else { Err(from_glib_full(error)) }
         }
     }
 

diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt
index 283ef13ecb511e1c8b07c1e4323d88a9e76d9115..ca6fe28197f4fcf0cc68ed3cdc2a2cccb7ebe3c8 100644 (file)
--- a/rust-bindings/rust/src/auto/versions.txt
+++ b/rust-bindings/rust/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1)
-from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+from gir-files (https://github.com/gtk-rs/gir-files @ 28a5895+)

diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt
index 283ef13ecb511e1c8b07c1e4323d88a9e76d9115..ca6fe28197f4fcf0cc68ed3cdc2a2cccb7ebe3c8 100644 (file)
--- a/rust-bindings/rust/sys/src/auto/versions.txt
+++ b/rust-bindings/rust/sys/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1)
-from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+from gir-files (https://github.com/gtk-rs/gir-files @ 28a5895+)